From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 3 Feb 2024 11:49:53 +0000 (-0500)
Subject: Merge from origin/emacs-29
X-Git-Tag: archive/raspbian/1%30.1+1-3+rpi1^2~14^2~18^2~2700
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=25bf8d3cdc6ce31e97b124a27be8c550d5525a55;p=emacs.git

Merge from origin/emacs-29

b91f0ee2fcc ; Fix last change
2f69353e4a7 Fix incompatibility with tree-sitter-javascript >= 0.20.2
d49124fc14b Avoid signaling errors from 'pixel-fill-region'
a3987127618 eglot: Add nushell language server
5f56bc1cdfc eglot: Add php-ts-mode to eglot-server-programs
c14c978e3b1 Support kotlin-ts-mode in Eglot
---

25bf8d3cdc6ce31e97b124a27be8c550d5525a55
diff --cc lisp/progmodes/eglot.el
index beba268f923,9eaa92da03e..df8a287b4f2
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@@ -283,7 -235,7 +283,8 @@@ automatically).
                                  (erlang-mode . ("erlang_ls" "--transport" "stdio"))
                                  ((yaml-ts-mode yaml-mode) . ("yaml-language-server" "--stdio"))
                                  (nix-mode . ,(eglot-alternatives '("nil" "rnix-lsp" "nixd")))
 +                                (nickel-mode . ("nls"))
+                                 ((nushell-mode nushell-ts-mode) . ("nu" "--lsp"))
                                  (gdscript-mode . ("localhost" 6008))
                                  ((fortran-mode f90-mode) . ("fortls"))
                                  (futhark-mode . ("futhark" "lsp"))